Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 7 May 2010 07:11:49 +0000 (07:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 7 May 2010 07:11:49 +0000 (07:11 +0000)
commit6ddd1aaa9c20aa397feeaaab1998cd9d990fc648
tree1700e3cb4950bbdd1aec0e46dcf2fed921f5cb5b
parenta55d3b41c25a83197bc02a6a790c6f927088e08f
parent751240ffe5e306d87e98052f361890ba8260d62c
Merge from mainline.